| commit | fa915d826dc1457802d162a72f3f11c03aa59d7f | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Mon Oct 31 22:05:57 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 31 22:05:57 2016 +0000 |
| tree | 6e94c6e456b415c1ead7186943c425104c6a5c94 | |
| parent | 2c3af71359ca3fd9b04d6dbe4e058be3d7945734 [diff] | |
| parent | 7fb29abcbf16ac3f4c8ae5ff27008155aefaf768 [diff] |
resolve merge conflicts of f4cf7f3 to stage-aosp-master am: 2cc2743c2f am: effb996c06 am: 7fb29abcbf Change-Id: Ie15528c5af649ab379d51bb6c3241b444a0160ff