| commit | f929ef6cbd711b07b3116af251490512c1681fae | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Tue Aug 23 22:56:52 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 23 22:56:52 2016 +0000 |
| tree | bd989f81596852da1727cd68b11ecd6804586a7f | |
| parent | 7914092dedcacaf7f68eeaf9495c411cc8553484 [diff] | |
| parent | 621fb590e3789c26e0ad536220d1d2c9e80e1f93 [diff] |
resolve merge conflicts of 24e38ab to stage-aosp-master am: 621fb590e3 Change-Id: Ia1b617a13012a8d475feb91bfbabb6ace264a29e