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