| commit | 7fb29abcbf16ac3f4c8ae5ff27008155aefaf768 | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Mon Oct 31 21:59:45 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 31 21:59:45 2016 +0000 |
| tree | d92f8e0aeac683eea6f6f7a01dcf95d85e2698cf | |
| parent | 75db2e9d13ae96b31572393f3039e3bd1011a2a1 [diff] | |
| parent | effb996c069bd0713f8b380c62ba9b0d399772fc [diff] |
resolve merge conflicts of f4cf7f3 to stage-aosp-master am: 2cc2743c2f am: effb996c06 Change-Id: I419476d4e5ba6870518b3708dbfb9f0120909311