| commit | 467ecaff086c134640bed81ebe8d03ca73d3b339 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Jan 18 23:43:23 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 18 23:43:23 2017 +0000 |
| tree | 53f14da6fcf5b18f7ccf13b6cfb5f2a04e6dd8cb | |
| parent | 295f4fdd48a347e8b165a0763dd5ad679dbcdb3a [diff] | |
| parent | 27cdfc3e9d7c71bd95639eb315fac2c36494e14e [diff] |
resolve merge conflicts of f79a82d6a to nyc-mr1-dev-plus-aosp am: 27cdfc3e9d Change-Id: I0219baebce53482f730cfb73ae600be01bbeb224