| commit | 430475da7f0edb86ee6a85378d1583ab07f7f93d | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Aug 07 08:50:46 2015 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Fri Aug 07 08:54:38 2015 -0700 |
| tree | d8deb8245d7fb3517c90679a3166b2ba37417a71 | |
| parent | 7af634e131361862d2e47fb344278e31ed05be4f [diff] | |
| parent | 0b3eca88899a12b8d5496f67df2f472ac9bdd0ed [diff] |
resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp Bug: 20923261 Change-Id: I6fe12a7c5768f77454bd0391b07f4c3181607d14