| commit | 5ca8f32280377dd923e72c3c6bd3994217461b8b | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Wed Aug 10 23:53:01 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 10 23:53:01 2016 +0000 |
| tree | b5146ce7885539d8b002d3270346f574e3965711 | |
| parent | 7aeb8c8d4437eb8f45be3ad3828764795e14ad4c [diff] | |
| parent | 63ef5a38f82d22c1f97922fe490a1fd336566d5c [diff] |
resolve merge conflicts of fd923e7 to stage-aosp-master am: df5d9246f9 am: 63ef5a38f8 Change-Id: I516a43c5e56323e99ad7a8ca2e4811b77c9704f4