tree 8ecabe4d52a664fc010ff0ebda32007f07f8b88b
parent 3f8b97b002caccd88673b5b04d8ef61900d63328
author Ed Heyl <edheyl@google.com> 1379443925 -0700
committer Ed Heyl <edheyl@google.com> 1379443925 -0700

cherry-pick 9c96479c: Revert Remove AOSP support. Do not merge.

Change-Id: I0d2d750b39b6966e06edc95b77aa4d07e485fa5f