This reverts commit 69c5d108a5.
69c5d108a5
This reverts commit c87f65d2cd. Bug: 18222321 Bug: 18211780 Change-Id: I00252e26a28a41ab9f1e2dd3b32f0f80d86297f1
c87f65d2cd
Bug: 18186310 Bug: https://code.google.com/p/android/issues/detail?id=64069 (cherry picked from commit 1b20dafdbe) Change-Id: Ic02eec22a7c322ece65eb40730a3404f611526b1
1b20dafdbe