| commit | 64b0e4432945039f0226918e2152854cc9db751b | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri Jun 24 12:17:53 2016 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Fri Jun 24 12:17:53 2016 -0700 |
| tree | 59a92ef6b58ebed05e53ba1246405c314b19224f | |
| parent | d1970e861bc9bab2aed8d38b6045ab7817b3fc31 [diff] | |
| parent | 60bd0b56fb447fa1021f9f48008297479dcc3d4f [diff] |
resolve merge conflicts of 079d417 to stage-aosp-master Change-Id: Ib8b7ed43d6c8dc4a9b843e6d2a974af30bcba0a0