tree 9edfff6774b4f31feaf1167a2c7045c1849e1113
parent fe20f3cb92b3a1138e769106e5b3d7a805f41b4b
author The Android Open Source Project <initial-contribution@android.com> 1352828071 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352828269 -0800

Manifest for master, updated for 4.2

Change-Id: I7bef8262cd30755c7dab1d8b66d256a4a5cf4770