| commit | af5f7d8e9790ce24a0db8b600d8ed92e11141f66 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Sep 20 20:34:33 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Sep 20 20:34:38 2016 +0000 |
| tree | 7b26b18cf2aba3a55d18a13c1250bcf8ee4d6575 | |
| parent | 1ec6ccdafcacb3fad031e098fae8471307e22c27 [diff] | |
| parent | e609ec63f0959cba8cbe58c0e6096b7546b43976 [diff] |
Merge "resolve merge conflicts of 491bc2b to nyc-dr1-dev am: 45bf970ebc" into nyc-mr1-dev