| commit | df5d9246f9607b1c2f8b134c46a05af06e206da3 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Wed Aug 10 15:40:39 2016 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Wed Aug 10 16:10:32 2016 -0700 |
| tree | 7cd9fcb42c86c8cfe950db239e21e8b5ece98369 | |
| parent | 7ad2854adc0abe8dd7909a6ed401107ad09bc3d2 [diff] | |
| parent | fd923e7fe2779bcd69d79471b8c30c8b98918f62 [diff] |
resolve merge conflicts of fd923e7 to stage-aosp-master Change-Id: I75b44b89bae41197a1fd68362d20b8ba2b4dd192