| commit | 1b4f3b45091486b0ffdbdec7b3080196b285c460 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Mon Jul 14 23:41:24 2014 -0700 |
| committer | Ed Heyl <edheyl@google.com> | Mon Jul 14 23:41:24 2014 -0700 |
| tree | 4c50cd0c7f98234e48b2f860e691b933e191f9c6 | |
| parent | ca8fd6a3ea06acc2d3dff8056d629ad485a6efbb [diff] |
reconcile aosp (351ef0a36b287d1cdc268e2061bfff343d24b9ea) after branching. Please do not merge. Change-Id: I14af51f3b842555bd139517c7a48755260f954a7