| commit | 04e9d830b0c549587c9867778a5d0069373c0853 | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Thu Jun 16 17:07:15 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 16 17:07:15 2016 +0000 |
| tree | bad4119260d599c0f12b46c6c0f163dd8a7b69bd | |
| parent | d3a0f10b8df7117d87e1b7a2a21f2d49c48bb6ed [diff] | |
| parent | fd1854cdfa1d5c05157274aac15a4e0cedc69e44 [diff] |
resolve merge conflicts of 20d55a7 to stage-aosp-master am: 5f551b3fdc am: fd1854cdfa Change-Id: I6942aa753a512f0a24725de0ea72ed20c067ad15