| commit | 7273bd72c2ee52e05a692595022c6a223594b97c | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 01 21:12:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 21:12:57 2015 +0000 |
| tree | 987574a480911572297417d281c1f86193d3973f | |
| parent | 413f951d8195b7bee207698d5092fde78b118fd9 [diff] | |
| parent | 6216c4acbbe36b7c14f20ab757948dfe53243211 [diff] |
am 6216c4ac: (-s ours) am a9f1a9f9: (-s ours) am 705405df: (-s ours) am a3d541b5: (-s ours) Merge "DO NOT MERGE ANYWHERE: bumping cts to 5.1r3" into lollipop-mr1-cts-dev * commit '6216c4acbbe36b7c14f20ab757948dfe53243211': DO NOT MERGE ANYWHERE: bumping cts to 5.1r3