| commit | ff13cc20fedec05ef969da676b6687cd5ff437e6 | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Wed Oct 26 20:12:56 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 26 20:12:56 2016 +0000 |
| tree | 4cf9dcd39ab2dff193996e5f004e9f8b51f343e5 | |
| parent | bb139c5633dc9fb9f54be75ba0db660e0f8c1110 [diff] | |
| parent | bc2af49c21358454c18418ef194a26d15a0d41d5 [diff] |
resolve merge conflicts of ab00546 to stage-aosp-master am: bc2af49c21 Change-Id: I95cfcd3907105ef1969f02bf1229ba0c5eb9b8c7