| commit | bdac29132b9893783bfca0f32369e0b56f39d63b | [log] [tgz] |
|---|---|---|
| author | Meng Wang <mewan@google.com> | Thu Dec 08 20:08:10 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 08 20:08:10 2016 +0000 |
| tree | 1a7386d08e998659050c6b09f80df3c613b00a83 | |
| parent | a2f5754978eebbda38a84eaccf67b6dfdba61772 [diff] | |
| parent | 378f2098bdb4de6eed1d623ea5aa418cc9f077a1 [diff] |
resolve merge conflicts of 0665760 to nyc-mr2-dev-plus-aosp am: 378f2098bd Change-Id: Ic869c21ae95a0ac7877c335d5ffd2516e26e99a0