| commit | f7b4fd24e3b1f48814ded0fdc694cbfb305d365a | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@google.com> | Wed Aug 17 21:07:54 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 17 21:07:54 2016 +0000 |
| tree | be72adabc15aa5441ffc47693781d883084df881 | |
| parent | fbced4bfc7b96cbe7e8c500995a42f0fc137bef7 [diff] | |
| parent | 67ffd5e61730d4074c174fa72fb752666cc8bbe0 [diff] |
resolve merge conflicts of c76a3ac to stage-aosp-master am: 67ffd5e617 Change-Id: Ib2d89672efe8757edff320d5ed800b7b0293323b