| commit | 879a5169ec226fa6b8c0c6d1e97e17591ee4a817 | [log] [tgz] |
|---|---|---|
| author | Marie Janssen <jamuraa@google.com> | Mon Oct 31 11:00:06 2016 -0700 |
| committer | Marie Janssen <jamuraa@google.com> | Mon Oct 31 11:00:06 2016 -0700 |
| tree | ade0e5df7e1d209db2df9413573743182ea1ee49 | |
| parent | 9e4d4ee4843f855a9a6a15367f49404d4b5b6ef4 [diff] | |
| parent | 6a31a5c2dd02fc6cc0a746f03b9ce85fadba45be [diff] |
resolve merge conflicts of 6a31a5c to stage-aosp-master Change-Id: I29f2085f4656b0b57896ef505ef6a50cdbd1b194