| commit | 694b2ec56e4c3f1922fac0144f7f793efaa5ffac | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jun 27 17:02:24 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 27 17:02:24 2016 +0000 |
| tree | ce5bee46127e416e1f3741a5c76962ed33be379d | |
| parent | 77b189acd9975f879fa27b57dbbc9460635fdd33 [diff] | |
| parent | 7f5b29ff1e5debb36fda8679df3e75343b4ba39f [diff] |
resolve merge conflicts of 54c1219 to stage-aosp-master am: 7f5b29ff1e Change-Id: I8774fc7a4ea5588f27bc65c016335ec88ff07f3a