| commit | 1423ab75a43d5ad0c4f17c15b4eefa3357c88152 | [log] [tgz] |
|---|---|---|
| author | Nicolas Prevot <nprevot@google.com> | Thu Jul 17 17:05:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 17 17:05:55 2014 +0000 |
| tree | baeceecfb7737e7c3a9423b84bf877d4b8614b0f | |
| parent | 9316d091cc57264437b1a7859a91d2b0c0aaaff5 [diff] | |
| parent | 62e5655df9e6dbc7a96151ce2dfa19e3ac6c7ff1 [diff] |
am a2a8501e: am 9a4cf569: DO NOT MERGE * commit 'a2a8501ed552ec2c7679f079b2118a6eed2827ac': DO NOT MERGE