tree e5d0c2f0bdb5c230a3a1db31362e60208cd09ccb
parent 795f789c6a52503812c3af2178ea7b63779250e9
parent 3ba41fdc57cf558d367ba900b8128c64da860e80
author Colin Cross <ccross@android.com> 1458935800 -0700
committer Colin Cross <ccross@android.com> 1458939650 -0700

Manually merge AOSP into nyc-dev

Bug: 26839129
Change-Id: Ifbeb031a3c30acdb0dc0f5e218f9f8c53b91553e