| commit | 0d2fe6279ab3f6a60e1ff21c00871093f8ed6370 | [log] [tgz] |
|---|---|---|
| author | Janis Danisevskis <jdanis@google.com> | Tue Aug 23 09:12:20 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 23 09:12:20 2016 +0000 |
| tree | 40e1992584e918a4fc15c7a8c6aa6bdee19e254e | |
| parent | 6ee691657add6cbef896cababe1120f53c85adb4 [diff] | |
| parent | 8ca27b1e87b987a53f112897d0947e7d4b1d47f3 [diff] |
resolve merge conflicts of 8b6704c to stage-aosp-master am: 8ca27b1e87 Change-Id: I8550faf8ad3834b8307bc8ac2953dac280a15844