| commit | 311f99eade1222575bc65a2fcbd9f9a5a40d2024 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri Aug 12 11:13:49 2016 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Fri Aug 12 11:13:49 2016 -0700 |
| tree | 6447b98dbfe17885b554084501e3bb1efb0087fc | |
| parent | 89155dfeef87e07c36a6cf1dc839e881e8838e57 [diff] | |
| parent | 70066d92606c66dedd27c974a7ee6f84e36ef015 [diff] |
resolve merge conflicts of 70066d9 to stage-aosp-master Change-Id: I9af1ace904388c91e6ce885e8a6d3540eb57bb4a