tree 3000167edbb74c85a25367e6b4916e17d40b67a0
parent 967ad6eb256c525e39d339a24f1bfc970f47470d
parent fdce3778fbb3dd91ebc4d5fff9fd85fe8991d049
author Gloria Wang <gwang@google.com> 1305736201 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305736201 -0700

am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2

* commit '5a6c3d491ccac07ef3f6a624a8a3e0c36959b661':
  DO NOT MERGE For bug 4422428 Squashed commit of the following: