| commit | ad5b98466578edfeba9f720eecee2a2f1593c5a4 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Jun 23 22:49:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 23 22:49:17 2015 +0000 |
| tree | b8dc78ddfab92ccff61362a15efd9683c5ba4840 | |
| parent | 32bfb59f8961668404ae15ce3c197b05930d244b [diff] | |
| parent | f6e59e138e26084cbcb106916cd5e545226f53e1 [diff] |
am f6e59e13: am c5854556: Merge "resolve merge conflicts of 3b15b5e to lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev * commit 'f6e59e138e26084cbcb106916cd5e545226f53e1': DO NOT MERGE: missing comma