am 81ff156b: am 2ad6067c: (-s ours) do not merge: cherry-picked...
am 81ff156b: am 2ad6067c: (-s ours) do not merge: cherry-picked 44db990d from master branch
Merge commit '81ff156b' into gingerbread-plus-aosp
* commit '81ff156b':
do not merge: cherry-picked 44db990d from master branch