| commit | 9c30c29e70264024323bccf478bcd8dd624c89d1 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Thu Aug 18 06:40:44 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 18 06:40:44 2016 +0000 |
| tree | c3937a78321bc572fcc2c6a95f23e0806cc3e968 | |
| parent | b580027c159ca1a7fc08040c936cb8384a611998 [diff] | |
| parent | 9de20d4a7ce848cec2644da6e1fa7c50b9f07830 [diff] |
resolve merge conflicts of 7f8dc84 to nyc-mr1-dev-plus-aosp am: 9de20d4a7c Change-Id: Ib79151c746f36a056a8236fedf5afb1cdc0dfcce