| commit | 8ee37b4f1c58e1dcd00b198a9bbfeafb4221fdc9 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Mon Jul 14 23:32:08 2014 -0700 |
| committer | Ed Heyl <edheyl@google.com> | Mon Jul 14 23:32:08 2014 -0700 |
| tree | 4c6c8b87798d897300c01f9df4b741cd9b593873 | |
| parent | 81839dfb24094803125f7ac9d4844207b61569ed [diff] |
reconcile aosp (c103da877b72aae80616dbc192982aaf75dfe888) after branching. Please do not merge. Change-Id: Ic9dde806a30d3e7b9c4a066f247a9207fe9b94b4