| commit | 05160d70d14180fef3782a63dff2e822b51c3cf5 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Thu Jul 21 18:13:31 2016 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Thu Jul 21 18:13:31 2016 -0700 |
| tree | 4f8f6504761b71975a9c7a3790aef427f275fc8a | |
| parent | 95e42d97f4b5150db2dcf1c26b3b50e6e133d1e4 [diff] | |
| parent | 5152fd909cf3bb9c7d27f0379f3dc1db619d2b8a [diff] |
resolve merge conflicts of 5152fd9 to stage-aosp-master Change-Id: I2066125eb4076dbc9e8996bb1fa87735aa6040d3