| commit | b3d46b44a399ba0a9b14caac8603db15089ab55b | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri Aug 12 11:35:17 2016 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Fri Aug 12 11:44:16 2016 -0700 |
| tree | 94e2f4c534e4ae9b80dce102aa1f1b3fce89ac5c | |
| parent | ed935c32f478229220a90442da0af3c3d3fc6230 [diff] | |
| parent | 17bd236b4b6b78c32a187649aa4abcf94e5951c3 [diff] |
resolve merge conflicts of 17bd236 to stage-aosp-master Change-Id: I08d4500aaa378b08d41e8d046c62101e08dbfba8