tree b05c810ed2141776003404f1c4c748f45a36c3ea
parent 6cd38acb9dbc437edc672435304e7727a9802e15
author Ed Heyl <edheyl@google.com> 1405404366 -0700
committer Ed Heyl <edheyl@google.com> 1405404366 -0700

reconcile aosp (8b663ef01dcaadfe1dec7ba826e5cd1cf0bb2c91) after branching. Please do not merge.

Change-Id: Ie1de3508b9a4c39330aa2efd895073a07d8933fa