tree 96e61436622122b03a2a406b04770bb4b245342b
parent 4f0d4e91836f112ee09d91dd98e585b64d42f34a
parent 0729ec54cdc856990366b401a117daec11c2dc97
author The Android Open Source Project <initial-contribution@android.com> 1362424208 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362424208 +0000

am 0729ec54: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '0729ec54cdc856990366b401a117daec11c2dc97':
  JWQ63
  JWQ59D
  JWQ59C
  JWQ59B
  JWQ59
  JWQ58
  JWQ57
  JWQ56C
  JWQ56B
  JWQ56
  JWQ52D
  JWQ52C
  JWQ52B
  JWQ52
  JWQ51C
  JWQ51B