| commit | afa130e64252aa2e0bc52228602fb572f2c88445 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Mon Oct 17 10:53:03 2016 -0700 |
| committer | Andy Hung <hunga@google.com> | Mon Oct 17 10:53:03 2016 -0700 |
| tree | a36f616328ec5b408e83e1b8d340f8e36b5bb1ad | |
| parent | e294d0ac2643abe520e8dc7d9cf14d947235c75a [diff] | |
| parent | ed53888e97222d8288c832cd94a4ea235c35238b [diff] |
resolve merge conflicts of ed53888 to nougat-cts-dev Change-Id: I3a79f36213a81fdefb41831a55947bb1b0b7be12