tree 05fceb1bcfe487bd242531380cac509dfdb0d2b6
parent 0efe974ee6787f84d4a2f14487e31bbbd3d011bd
parent 50a2a8765a3d3fe07d2b0e2be65dea74acc0da1f
author Jean-Baptiste Queru <jbq@google.com> 1291674067 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1291674067 -0800

Merge "Merge from gingerbread-plus-aosp"