| commit | e0c6824f32c7f1fd230267316e61b849fda7189d | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Mon Jul 21 11:39:14 2014 +0100 |
| committer | Neil Fuller <nfuller@google.com> | Mon Jul 21 11:39:14 2014 +0100 |
| tree | 5badec035042a8c49408e03367fb666d23d0e564 | |
| parent | d3d58171cc734f59faa5a03ce1cd5d5c00e9ffbd [diff] | |
| parent | 47f0ec56cee6518e19296150ecc8800bb2ac5af5 [diff] |
resolved conflicts for merge of 47f0ec56 to jb-dev-plus-aosp Change-Id: I75aee3cb8a56197e6be60deb486c13e95f84644d