| commit | 5ad302b0905f06454021fd636de4f2864eea6e82 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jun 20 22:40:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 20 22:40:15 2014 +0000 |
| tree | 372e4f42ec8869893f28226faf873e3ba30ed27f | |
| parent | a076aed1791cb86dee663c854315de5751462b90 [diff] | |
| parent | 9c6235777e89b54fd933c187ffa1d9184086a787 [diff] |
am 9c623577: (-s ours) am 85fe1439: (-s ours) Merge "Restore AOSP-style version numbers - DO NOT MERGE" * commit '9c6235777e89b54fd933c187ffa1d9184086a787': Restore AOSP-style version numbers - DO NOT MERGE