am 2ed9ee1e: Merge remote-tracking branch \'goog/stage-aosp-master\' into HEAD

* commit '2ed9ee1e938a94b563ab700dc5017a968d2591ad':
This commit is contained in:
The Android Open Source Project
2014-11-07 13:27:16 +00:00
committed by Android Git Automerger

Diff Content Not Available