| commit | 6e423bde1201ba9361b123c3c1bc52ba506ad35a | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Wed Sep 28 19:50:03 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 28 19:50:03 2016 +0000 |
| tree | a1c0874dce525ddef2b6da9085cfa7318141ec9b | |
| parent | 2008a5350d075bd34a243a7bcdce9d8360cccd1c [diff] | |
| parent | 2131dcf9f6c41c74fd33ea97bf30bb56ed997d2b [diff] |
resolve merge conflicts of 199c0b3 to nyc-mr1-dev-plus-aosp am: 2131dcf9f6 Change-Id: I6b7fad7afd792b705c5c32535d8d4e5637b9d0f2