merge in master-release history after reset to 1dd27aa707eb14466b8e87a252bd481cdec6080c
The Android Automerger [Wed, 21 May 2014 12:49:05 +0000 (05:49 -0700)]

Trivial merge