| commit | 8647de4c5918abbd8228469c2007084b54aa4d20 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Mon Jul 14 23:41:29 2014 -0700 |
| committer | Ed Heyl <edheyl@google.com> | Mon Jul 14 23:41:29 2014 -0700 |
| tree | 5bb561c8df74ca8a56e0773037ded8e016db8b43 | |
| parent | 1b4f3b45091486b0ffdbdec7b3080196b285c460 [diff] |
reconcile aosp (18943d5c020fb77666d2a2cdab9558f820abb0c0) after branching. Please do not merge. Change-Id: I40b5ae39024d99870a04488336cf671eb2abc811