tree edfd801b7081aa06016b9a16517b09653dc849b2
parent 73fd3195bd1f8af54f5a6273775186974078068c
parent b926b3c6821726bf24245478cf24788c57910f0c
author Brian Carlstrom <bdc@google.com> 1381475862 -0700
committer Brian Carlstrom <bdc@google.com> 1381475862 -0700

resolved conflicts for merge of b926b3c6 to dalvik-dev

Change-Id: Ic56131b49ddfa1ffbc9b50f15e79a0210bd07a41