tree 5ab9d6dcfa3816a64ffd5ba5885343f38bc0416e
parent 7372505e2f450f722afc07a1b2b0e28390150ad7
parent 80d21f2f834efe84ba7f3eb0b1159ffa889beb20
author Jean-Baptiste Queru <jbq@google.com> 1339442436 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1339442436 -0700

resolved conflicts for merge of 80d21f2f to jb-dev-plus-aosp

Change-Id: I44b2ba647fb3b208119d10aed3fa6fc85dddfb0d