| commit | 8dc50416a209e76bca38694d59d5779ffcf08d92 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Apr 28 09:42:54 2015 -0700 |
| committer | Marco Nelissen <marcone@google.com> | Tue Apr 28 09:42:54 2015 -0700 |
| tree | 5b53a65f74945bc044606713748acc9ad4059f44 | |
| parent | 22a257db8046c4cc08940d4198c0ba12fddd280b [diff] | |
| parent | 375e21f811a37b5ea191ea1f092c3d11947d1ab0 [diff] |
resolved conflicts for merge of 375e21f8 to mnc-dev-plus-aosp Change-Id: I5681890381beed09e8719b066d0c37accae1658d