| commit | c1965c958c9ffabffb45bbae8821eae8912d5ca9 | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Wed Jul 13 19:23:17 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 13 19:23:17 2016 +0000 |
| tree | e2613723b9dbf0062d0d133e828deee6decdad4c | |
| parent | f6447b0eb5d21c557ff6b4c2ca1b5a093f4ed334 [diff] | |
| parent | d269bf4328b608d43b357adbbe3b25d7136883bf [diff] |
resolve merge conflicts of 69ed5d9 to stage-aosp-master am: d269bf4328 Change-Id: I1db9a613f52dcaaef3d7f50d2cb797be7cfd82e0