| commit | 62e5655df9e6dbc7a96151ce2dfa19e3ac6c7ff1 | [log] [tgz] |
|---|---|---|
| author | Nicolas Prevot <nprevot@google.com> | Thu Jul 17 14:19:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 17 14:19:28 2014 +0000 |
| tree | 1aff5283c11ac3b1ef35a7ba96f5deb63c1035f1 | |
| parent | bd734c73e58cf62f630c5e45b8a90566b2a009b4 [diff] | |
| parent | e702404c5a9d46765acb76f63ea6338d0a42b030 [diff] |
am 9a4cf569: DO NOT MERGE * commit '9a4cf569e9b4e4bcea5b20c954120aa890df9e2b': DO NOT MERGE