tree f4a1a9d3d5518dcb3d9e02ef3f5b071b27b8c96b
parent 0721bde26c73861bb40a5732cb63741d13776e36
parent 409d563b51853fc9dce6b4c02df84f58ec887afd
author Dianne Hackborn <hackbod@google.com> 1339530121 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339530121 -0700

am 409d563b: Merge "DO NOT MERGE: Cherry-pick 2ed524966d3c4bd04ea5f54026ed59558d73cd44 to JB." into jb-dev

* commit '409d563b51853fc9dce6b4c02df84f58ec887afd':
  DO NOT MERGE: Cherry-pick 2ed524966d3c4bd04ea5f54026ed59558d73cd44 to JB.