| commit | 016cd49835bea59b11059850d3dce302c5f840c8 | [log] [tgz] |
|---|---|---|
| author | Jorge Lucangeli Obes <jorgelo@google.com> | Thu Jul 14 00:47:26 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 00:47:26 2016 +0000 |
| tree | 106bcec696c7215707b17653af581db6460af5a1 | |
| parent | b8b4efa80ea536bafdd21672ad2503861e1980c4 [diff] | |
| parent | 78daa7208345a8de4483d8235f0b4bebcb9b8a72 [diff] |
resolve merge conflicts of 1b9b273 to stage-aosp-master am: dba909bd9e Change-Id: I61506e871cfccaa1cc0bee70a0b8dd35029a3efe