commit | 938950f412aa38aee0c7723cca9c8a0cd2636741 | [log] [tgz] |
---|---|---|
author | Nicholas Sauer <nicksauer@google.com> | Thu Feb 20 18:18:15 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 18:18:15 2014 +0000 |
tree | fbd614f8533efab866884e5407ccd537ba414072 | |
parent | 4ded3af09b7a72d4c7d00b01bb16496ffc0157ce [diff] | |
parent | 001664d27c8fedf061b5439cbf0c42c3e615bdcc [diff] |
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 '001664d27c8fedf061b5439cbf0c42c3e615bdcc': DO NOT MERGE Increment jb-mr1.1 version number for impending CTS release.