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