| commit | e28b22f8ee26b2902ff7567fa8acb02557a912d4 | [log] [tgz] |
|---|---|---|
| author | David Gross <dgross@google.com> | Wed Jun 15 21:03:21 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 15 21:03:21 2016 +0000 |
| tree | 24512f24c8ec72a7bcf708d4b87bd23fa6bee33f | |
| parent | 1dc03b4fc13064bdc6dd7f9430299256e6c4a3e6 [diff] | |
| parent | 97bc7b20495c70a4bdc05ecbe7d0822203eaffc5 [diff] |
resolve merge conflicts of d9547d9 to stage-aosp-master am: 97bc7b2049 Change-Id: I4a6b134182286a8ef4fe485acaa3639fa8d9e7c5