| commit | 7563a6f1fb36c2361294b785dba499cc65b7dbf4 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Mon Jul 14 23:31:01 2014 -0700 |
| committer | Ed Heyl <edheyl@google.com> | Mon Jul 14 23:31:01 2014 -0700 |
| tree | 58526d14ea665fec975a5ffdb348334dc3e13beb | |
| parent | e9c90bddcea8d3d466fbc34361a7feea3eea4ad3 [diff] |
reconcile aosp (a7c04dcd748e1a9daf374551303a3bd578305cf9) after branching. Please do not merge. Change-Id: I35be7a7df73325fba921b8a354659b2b2a3e06e7