tree 023429b3d7e10d16ac3118b2fa928750a3179dbe
parent 980a59b45dd210d2c2d0d9e61d48899af2d1099f
parent e4e3f20f5784e719dc221114d7030b241e455f63
author Jean-Baptiste Queru <jbq@google.com> 1335314329 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1335314334 -0700

Merge from AOSP

Change-Id: Iedb6ea4e1cf66edda8d91e3d432cb010e697ed44