tree 399de1d0adc658aa779d72872b3629b441c11396
parent 05144ea1efd569a46e02f7b729150b7ca80b695f
author Spike Sprague <spikuru@google.com> 1407448587 -0700
committer The Android Automerger <android-build@google.com> 1407527370 -0700

rollback of b/16632474 and ag/518674

Change-Id: I77af6135ff339240bd52881550a0f42ec996f9c4