tree fe95c08392b1dca4646a3cf9bb6eaa1afce2e259
parent cc523d1b538325e5722f5627d0f836138e6a2920
parent 092198f55461ecc2ebb209da4682b3e59cbcb8e6
author Mathias Agopian <mathias@google.com> 1266012543 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1266012543 -0800

Merge changes I128ce4b2,I5cbb940c

* changes:
  real fix for [2440014] launcher2 crashing in loop during boot
  Revert "Revert "RenderScript should not depend on libsurfaceflinger_client.so""