| commit | 621fb590e3789c26e0ad536220d1d2c9e80e1f93 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Tue Aug 23 15:10:47 2016 -0700 |
| committer | John Reck <jreck@google.com> | Tue Aug 23 15:10:47 2016 -0700 |
| tree | 5d01cff970041c688ba49f1602284cc160f62c8a | |
| parent | b98783291802ef762a543876cb4f7f428d0d97fa [diff] | |
| parent | 24e38ab322a0c396df1c6fe95f3f427d85cd5da1 [diff] |
resolve merge conflicts of 24e38ab to stage-aosp-master Change-Id: I02db3eb317ccb182b563ec9350a116bd5de063b6