| commit | 90573e552ea91606e1ea4a713897cb49824d09dd | [log] [tgz] |
|---|---|---|
| author | Jorge Lucangeli Obes <jorgelo@google.com> | Thu Jul 14 00:52:46 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 00:52:46 2016 +0000 |
| tree | 368db1b79f9b1c8cc55b4071f903804aef833a64 | |
| parent | 17d416fbf6f556a11ec280019719d264e3c8fd33 [diff] | |
| parent | 6228aedd0e755b13b7a3a3093caabb4186461b3c [diff] |
resolve merge conflicts of 1b9b273 to stage-aosp-master am: dba909bd9e am: 7a52c83311 am: c754f2673f Change-Id: I9f0af462ff0b1969696e3f89eefe176bfe7451d4