| commit | 917bcc4df9099351a5b8e8d982e5d32b9c4425ab | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Wed Jul 13 19:30:24 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 13 19:30:24 2016 +0000 |
| tree | c5a434ed8ea571aba3f807a99d0073533e354240 | |
| parent | 94b4e3b0f24be26657050fca6ca679e63b064d64 [diff] | |
| parent | 0002fe0e751e924b4353ed9ba0ecb0530921c1ef [diff] |
resolve merge conflicts of 69ed5d9 to stage-aosp-master am: d269bf4328 am: c1965c958c am: 0002fe0e75 Change-Id: I0c0f7b10857f97e0e4d4700069beaee0cc4cfd11