| commit | 64db7632025df91ff2d9742ca5bb4a7fe7428e95 | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Fri Jul 08 18:33:52 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 08 18:33:52 2016 +0000 |
| tree | 333f9d1e7545706aae30b03bcdf0368b24c81583 | |
| parent | 65defc4d77a692689d7375c3ce956e77f21358f2 [diff] | |
| parent | e4e7f8809b72186ed7dc8c130d9cdf7a58eca9f8 [diff] |
Merge \"resolve merge conflicts of 786f5de to nyc-mr1-dev-plus-aosp\" into nyc-mr1-dev-plus-aosp am: 479c280e58 Change-Id: I4c836744bc9837569c0be6a870b1b668ef2e5472