tree a8e77af69edd9db40c53b31d1c36b5cae7a2b5c6
parent 57aadbb096a118dd33f9f16c67bd18dbb6b92c4a
parent 50a83255d80f98b857c3f72dd2225d4bbc720ca3
author David 'Digit' Turner <digit@google.com> 1310413146 +0200
committer David 'Digit' Turner <digit@google.com> 1310413154 +0200

resolved conflicts for merge of 50a83255 to gingerbread-plus-aosp

Change-Id: Idf1971120bbdd52676f95aa3aa69f62342dc012e