tree 889cadcbbdf77df6aba8fdae57486746cd081408
parent b755d1cb748157fc07e538838fa384856e118f31
parent b61d93a4d472411e2127f139e7affecaec4950c9
author Elliott Hughes <enh@google.com> 1374183016 -0700
committer Elliott Hughes <enh@google.com> 1374183016 -0700

resolved conflicts for merge of b61d93a4 to stage-aosp-master

Change-Id: I25ce1463879e29398c0bf4b44c270c16a0bc1d03