commit | b4ef84d704cf099585b113db533548be415367c5 | [log] [tgz] |
---|---|---|
author | Dan Albert <danalbert@google.com> | Fri Sep 12 13:05:56 2014 -0700 |
committer | Dan Albert <danalbert@google.com> | Fri Sep 12 13:06:50 2014 -0700 |
tree | 3e2e66042274db4db389846ad918095cca8709fd | |
parent | 9b6db0abe436a1fb7f898d9729eec5217933b776 [diff] | |
parent | 2b2a0bec0cf350ae6239d7b2a31c5a328ddb2b32 [diff] |
resolved conflicts for merge of 2b2a0bec to lmp-dev-plus-aosp Change-Id: I224499833777ef80d85c1199f475f5ed1568d053