| commit | a688f8408854a858874b3d4523d6e2c4d6135aee | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jun 20 23:14:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 20 23:14:34 2014 +0000 |
| tree | 0ca10dd2ce7260cfdc4cea61675b0f2546b257ef | |
| parent | a7f4b3845a92dedf3988c6730b1a219374c26512 [diff] | |
| parent | 5ad302b0905f06454021fd636de4f2864eea6e82 [diff] |
am 5ad302b0: (-s ours) am 9c623577: (-s ours) am 85fe1439: (-s ours) Merge "Restore AOSP-style version numbers - DO NOT MERGE" * commit '5ad302b0905f06454021fd636de4f2864eea6e82': Restore AOSP-style version numbers - DO NOT MERGE