| commit | 5eb1be561420ec881e32cc01de46f697b2dba3bb | [log] [tgz] |
|---|---|---|
| author | Chris Banes <chrisbanes@google.com> | Tue Jan 24 09:57:26 2017 +0000 |
| committer | Chris Banes <chrisbanes@google.com> | Tue Jan 24 09:57:26 2017 +0000 |
| tree | c3bf7dcbc0a83a1f19ac9f2e77bd89e5050f3e91 | |
| parent | d9ac4809c7e62b5de45799e16b7645d6161fba3f [diff] | |
| parent | e6c9959fe4431af6fb3b054deba2581375120ba4 [diff] |
resolve merge conflicts of e6c9959fe4 to stage-aosp-master Change-Id: I11e94e0c01d76dbdf85f27663b990c770baf143d