| commit | 6228aedd0e755b13b7a3a3093caabb4186461b3c | [log] [tgz] |
|---|---|---|
| author | Jorge Lucangeli Obes <jorgelo@google.com> | Thu Jul 14 00:50:01 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 00:50:01 2016 +0000 |
| tree | ad596ea40b9141a082571347ec2441f8bb7d1367 | |
| parent | 8857d7e4c8563894df5144e2cf7bab060690ffe2 [diff] | |
| parent | 016cd49835bea59b11059850d3dce302c5f840c8 [diff] |
resolve merge conflicts of 1b9b273 to stage-aosp-master am: dba909bd9e am: 7a52c83311 Change-Id: I1ed6352ef9a99e9bd41459d29b2e110a42021b42