| commit | 601354a3585d926468ef4e1419f79e735546739b | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Thu Feb 20 18:25:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 18:25:38 2014 +0000 |
| tree | 544d69c1f8f56ab038c3a6836b15a0e03edb8a59 | |
| parent | 481a8129c2cc60d1e0343659b1d044fdfc5bda3c [diff] | |
| parent | 7d6e421b7f9b9d96492b11c143a1ff207f785362 [diff] |
am 7d6e421b: 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 '7d6e421b7f9b9d96492b11c143a1ff207f785362': DO NOT MERGE Increment jb-mr1.1 version number for impending CTS release.