| commit | e798ce4123df899bfbd2b4d56538d97a6528cbf4 | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Tue Jun 28 00:28:44 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 28 00:28:44 2016 +0000 |
| tree | 45b30da5885c2110b9120bc4ca50bdf82ff48b9d | |
| parent | 2eb6bb13a03db509c476c107a625904ece9c11d0 [diff] | |
| parent | 3b143a2d6509295c3f267a8d7e4ba2eeabe0699b [diff] |
resolve merge conflicts of a486a4b to nyc-dev-plus-aosp am: 59ffd7ef67 am: 3b143a2d65 Change-Id: I23accf5ade93c649c5208ca664dbbdb19d446dc2