tree 1e88da72ed376ffd4ad11b3fcacbf221ad1ab125
parent e51d8b3ba4533b7f94345a97e3cc633dc7b31f12
parent a556c4822fc205db0d27834ba5b637c351d73ffa
author Andreas Huber <andih@google.com> 1362519388 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1362519388 +0000

Merge "Squashed commit of the following:" into jb-mr2-dev