| commit | 9c6235777e89b54fd933c187ffa1d9184086a787 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jun 20 18:29:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 20 18:29:59 2014 +0000 |
| tree | 03f3803b118b9c7d178a9c13672e2f38baaa03b7 | |
| parent | 318c8e76ee8f47fb9f077e419713cf4dbb454788 [diff] | |
| parent | 85fe14395b8bbc5b44383c1705f60bfdc12c61cf [diff] |
am 85fe1439: (-s ours) Merge "Restore AOSP-style version numbers - DO NOT MERGE" * commit '85fe14395b8bbc5b44383c1705f60bfdc12c61cf': Restore AOSP-style version numbers - DO NOT MERGE