| commit | 8730ee39979c75dab4d9039bd3863bd3344dd2a5 | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackyu@google.com> | Thu Feb 09 18:01:38 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Feb 09 18:01:38 2017 +0000 |
| tree | 458cd54529c75ea2f9536517b3b466182345aaf3 | |
| parent | cb258bc847e33666f8294f461324f2e834cef665 [diff] | |
| parent | 3fd14d9357c3b40f9375da2a3c44bd4245265970 [diff] |
resolve merge conflicts of 83de809 to nyc-mr2-dev-plus-aosp am: 3fd14d9357 Change-Id: I0f75876d83eafb1ddf367084b53c1d6149bfb76d