| commit | e986be325cf7515070fce60fca22665d085b46f6 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Tue Aug 23 23:08:32 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 23 23:08:32 2016 +0000 |
| tree | 1453545438c2d552ce0951e5ff5fc5fc20d53682 | |
| parent | 31b42a20588cc246d0996a08bdda70ecc0350f4c [diff] | |
| parent | f929ef6cbd711b07b3116af251490512c1681fae [diff] |
resolve merge conflicts of 24e38ab to stage-aosp-master am: 621fb590e3 am: f929ef6cbd Change-Id: Ie7d5ff6858f95cf7725fa12df8d33420bc3954b2