am f6771f63: reconcile aosp (8689b90bcf) after branching. Please do not merge.

* commit 'f6771f631b814189d83b9b16cfa73d1466f932af':
  reconcile aosp (8689b90bcf) after branching. Please do not merge.
This commit is contained in:
Ed Heyl 2014-07-15 17:01:35 +00:00 committed by Android Git Automerger
commit 7b03930ddf

Diff content is not available