| commit | ab757b423f68f96093fd56bd0b82a393014cc7dc | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Mon Jun 27 21:39:12 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 27 21:39:12 2016 +0000 |
| tree | 21b2b834c6cc03f142050c3a4df94c439cab22fe | |
| parent | 1cd1ded4dc7c6fd40cfa3135166b66907aa534f3 [diff] | |
| parent | 9197c89071e555620184d83ac7ee9ee491e55fd5 [diff] |
resolve merge conflicts of 079d417 to stage-aosp-master am: 64b0e44329 am: 9197c89071 Change-Id: I829286b8c46ba540a4bf57a1f5ba6aee04a70535