| commit | 922ae6846ba2bf3ab3ede2969ad9e8ba19833614 | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Fri Jul 29 14:15:14 2016 -0700 |
| committer | Dan Willemsen <dwillemsen@google.com> | Fri Jul 29 14:15:14 2016 -0700 |
| tree | a6f7162cbc995e2d1f72f1e70d07b7365b9441f7 | |
| parent | 01efd46bca22e08ff408598e5dfeedab08c18e57 [diff] | |
| parent | dd9aee166beed12e2f8f7c2afb4083146c2eefdb [diff] |
resolve merge conflicts of dd9aee1 to stage-aosp-master Change-Id: I4278b9700c8729a06d38acc26e22ce7c340382f2