commit | 8491c4ead7dba5cfd406cf99a511fc1dce07cc4d | [log] [tgz] |
---|---|---|
author | Adam Lesinski <adamlesinski@google.com> | Wed Nov 05 20:31:19 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 05 20:31:20 2014 +0000 |
tree | e04662b84ae8cc05665206336a148928c23b7cab | |
parent | be3ac2a80b3607220a118abeb2dd0678f722af2c [diff] | |
parent | 685d363d7a3e8833edc9368a3c59b69755e0ba29 [diff] |
Merge "Merge commit 'fb96e54' into manualmerge" into lmp-mr1-dev-plus-aosp