tree a5ff6e391150dcfdea6ff629cf65b1bb1692c46f
parent 626e805d220b2003f769b112f124750f59b1353a
parent 91d0e3c950846ad0dfa67ac8d67b554880795580
author Vasu Nori <vnori@google.com> 1267574918 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1267574918 -0800

Merge "resubmit reverted CL https://android-git.corp.google.com/g/#change,42682"