| commit | 81839dfb24094803125f7ac9d4844207b61569ed | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Mon Jul 14 23:31:31 2014 -0700 |
| committer | Ed Heyl <edheyl@google.com> | Mon Jul 14 23:31:31 2014 -0700 |
| tree | 2deb18fce14f6b7ff2c688c3662307c0f8b06cd0 | |
| parent | 7563a6f1fb36c2361294b785dba499cc65b7dbf4 [diff] |
reconcile aosp (3a8c5dc05fb7696dd81b8a7c1b2524224154e8ea) after branching. Please do not merge. Change-Id: Ic8ee83ed6ffef02bddd17e1175416fc2481db7b2