tree 0af0b4faf3c59a3142273ccff4ce31525c487ef8
parent 7cf81f86af29125b792e4f29aa0780298232d004
parent c9285ae2e58fb722d4c90c2042dace1531e97cf1
author Adam Cohen <adamcohen@google.com> 1369096070 -0700
committer Adam Cohen <adamcohen@google.com> 1369096155 -0700

resolved conflicts for merge of c9285ae2 to jb-mr2-dev

Change-Id: I33edb03342cc745b8b7d2b2c1784cdf33b059758