| commit | d85bd5266effc37650c38e90033ffca2214e86aa | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Fri Jul 25 18:48:31 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 24 22:06:48 2014 +0000 |
| tree | 35ee56ef560507ad0971aa0cda0b1656a4808394 | |
| parent | 28c284f29f8659afe47c426aad6c075cf3e3e05d [diff] | |
| parent | 305e60ba0222a9e1edb43a3daba96f2555f83d85 [diff] |
Merge "resolved conflicts for merge of 9ef2ec9b to lmp-dev-plus-aosp" into lmp-dev-plus-aosp