commit | 7d6e421b7f9b9d96492b11c143a1ff207f785362 | [log] [tgz] |
---|---|---|
author | Nicholas Sauer <nicksauer@google.com> | Thu Feb 20 18:21:38 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 18:21:38 2014 +0000 |
tree | fc79c43858291314821ecaf8f14fec7019ccaecc | |
parent | 6d74770e49a509ad313302ec603f0788a49daeed [diff] | |
parent | 938950f412aa38aee0c7723cca9c8a0cd2636741 [diff] |
am 938950f4: am 001664d2: am ae3a3449: (-s ours) am 751da412: am ec258eea: (-s ours) am cc779cf5: Merge "DO NOT MERGE Increment jb-mr1.1 version number for impending CTS release." into jb-mr1.1-dev * commit '938950f412aa38aee0c7723cca9c8a0cd2636741': DO NOT MERGE Increment jb-mr1.1 version number for impending CTS release.