| commit | 9d6e550042024f46f02d492a1c11911f0df2f885 | [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 | 2bdf4e886bacc02ab51035ca799b824e6074ab3c [diff] | |
| parent | b52bf33c66f0598c162ce080209769f03c1e9712 [diff] |
resolve merge conflicts of 54c1219 to stage-aosp-master am: 7f5b29ff1e Change-Id: I8774fc7a4ea5588f27bc65c016335ec88ff07f3a