| commit | 91431061bd2be5bf398f26d9898094c45f00a261 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Jun 24 23:16:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 24 23:16:22 2015 +0000 |
| tree | 5b58ae44f9e9da519cbdf23ad527be882e98cf72 | |
| parent | 6d3001c8abef6d6c8a46ba843748afec21bbd0fc [diff] | |
| parent | 9f3cfc8ba01313f54b0e3ec7a6d9ea52daab462c [diff] |
am 9f3cfc8b: am 6cad1d84: am f186bbc3: am ad5b9846: am f6e59e13: am c5854556: Merge "resolve merge conflicts of 3b15b5e to lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev * commit '9f3cfc8ba01313f54b0e3ec7a6d9ea52daab462c': DO NOT MERGE: missing comma