| commit | 0bd6407666aa4d7b0a031900b4bb1c9103eb9bc5 | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Tue Sep 15 16:05:59 2015 -0700 |
| committer | Dan Austin <danielaustin@google.com> | Tue Sep 15 16:05:59 2015 -0700 |
| tree | fa3588c743c84675ea4d442f41c7a157df5cd523 | |
| parent | 86dbc0d62126868368b35a6127a7317248925247 [diff] | |
| parent | c1d159316d0a42066ffa124aab14e5f05b9d1c1f [diff] |
resolved conflicts for c1d15931 to stage-aosp-master Change-Id: Ifa38320051015548d04be30b4278adb34a4654a6