| commit | a50cd8d4264ca98e19b858596de3a223ba6bf42e | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Mon Jul 14 23:42:04 2014 -0700 |
| committer | Ed Heyl <edheyl@google.com> | Mon Jul 14 23:42:04 2014 -0700 |
| tree | bdaa74c4affa1ceed44acf2ff74d6c327428eb0b | |
| parent | 8ca04289eb090628dd355f684b7175146ff9a5b9 [diff] |
reconcile aosp (f908b61abf0882ce97d6d5076ee1c84393ed1ecd) after branching. Please do not merge. Change-Id: Icd3f2c31aca8c9888c81da27eaeaffed07ec9820