| commit | e569124e3230664763d47d6458455e186176b86b | [log] [tgz] |
|---|---|---|
| author | Jaewan Kim <jaewan@google.com> | Wed Jul 13 02:09:56 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 13 02:09:56 2016 +0000 |
| tree | baee069906bb5d2c7c161d673a858de502dd7cf7 | |
| parent | 7e6d8119e3bbbde65740879aa0d876eef13ef5b1 [diff] | |
| parent | 6bd036374cf2c0eabf961d0da531778229f9cd3c [diff] |
resolve merge conflicts of 78120b0 to nyc-mr1-dev-plus-aosp am: 6bd036374c Change-Id: I9d8a1e834305dd508c5d81881b5cbe5464f43fea