tree 11684487d8812ff1df08db91d9bf49bb64adb383
parent 82c11caca04bc4e14e0a33057f484635dc1ae8dc
parent 76af0657be461352ece41af3524cffc74261d21a
author Jean-Baptiste Queru <jbq@google.com> 1339538247 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1339538247 -0700

resolved conflicts for merge of 76af0657 to jb-dev-plus-aosp

Change-Id: I4843695261abbc478fd6b505debe6fc20a06c88d