| commit | ca8fd6a3ea06acc2d3dff8056d629ad485a6efbb | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Mon Jul 14 23:41:20 2014 -0700 |
| committer | Ed Heyl <edheyl@google.com> | Mon Jul 14 23:41:20 2014 -0700 |
| tree | 4bbeda7b71bc7ccd70e495224574c5d311431b56 | |
| parent | f04ee8beec372671963829a9e1ed29cd39e5e0bf [diff] |
reconcile aosp (6ce29b2a02f4196513557930da01ed06618c0f9c) after branching. Please do not merge. Change-Id: Id7a0db500456ab278b1ee0807996dd5629a65125