tree 5f14dceb012a33f6fed94def4cd1a91bdcc0191d
parent faa530146be1fd6de3cbeba7d60d88fc451de3f3
parent 2e977068a167ea597b6514501d2221c5a4e22574
author Xia Wang <xiaw@google.com> 1280522888 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280522888 -0700

am 2e977068: (-s ours) am 060f053e: DO NOT MERGE

Merge commit '2e977068a167ea597b6514501d2221c5a4e22574'

* commit '2e977068a167ea597b6514501d2221c5a4e22574':
  DO NOT MERGE