| commit | 76cc3d808ed0b38f992e3a9b765e7150d4706fdc | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Tue Jul 15 13:34:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 15 13:34:05 2014 +0000 |
| tree | b05c810ed2141776003404f1c4c748f45a36c3ea | |
| parent | afae28411ddf8240b84dbe953e9eef9098180a97 [diff] | |
| parent | e87eaf040ab639e94ed0a58ff0eac68d1d38fb0a [diff] |
am e87eaf04: reconcile aosp (8b663ef01dcaadfe1dec7ba826e5cd1cf0bb2c91) after branching. Please do not merge. * commit 'e87eaf040ab639e94ed0a58ff0eac68d1d38fb0a': reconcile aosp (8b663ef01dcaadfe1dec7ba826e5cd1cf0bb2c91) after branching. Please do not merge.