tree cd8fba11375823108e79b3d21634518b615ffcd8
parent 5e1acf980521da7dc179add96c50d78e714f026b
parent 0bcfe106e047fefebae59217eac67436e9516d99
author Jean-Baptiste Queru <jbq@google.com> 1344290368 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1344290403 -0700

Reconcile GOOG and AOSP jb-dev

Change-Id: I122236ad5146083063a9f680f3b5486928b545a3