tree 91d2ba83aaeef217e7ac7e2e2c89cc5f942b991c
parent 4e5d3f2ca05b513640d3163155756e01ae577d54
parent 7d46c613f6bfeb6638c6aafb52eab417ad8eef52
author Daniel Sandler <dsandler@android.com> 1322574551 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1322574551 -0800

Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1