tree a5b01e7714e08c28da6d945bea0296d013cbaccf
parent 90aa8ffda1ec6fcdd9413dc1e06091e64c431a76
parent d764bb7a4b3d7841dbe860818444bfc4d35742a1
author repo sync <chiachi@android.com> 1283444666 +0800
committer repo sync <chiachi@android.com> 1283444666 +0800

resolved conflicts for merge of 12eaf9d5 to master

Change-Id: Icb706bdf350a9c471070fa3e2296cde77ef3703d