| commit | cb71a58ce78e9491d0f92f3947d6bb23b5f93abe | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Fri Jan 13 18:52:17 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 13 18:52:17 2017 +0000 |
| tree | d706a0972684f88c0cdf342e730655dc4c31faab | |
| parent | b5c62d3c960ba87402111bc3a2eba00b7093f622 [diff] | |
| parent | f68cfd92bafb49f848f36c92ba9c8b65390e4620 [diff] |
resolve merge conflicts of 49056668f to nyc-mr2-dev-plus-aosp am: f68cfd92ba Change-Id: Icc740f605e4fdbd1f292e707e782230da178a2be