| commit | b2808c03c3de0d4fe6a986545fd506df0233b072 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Tue Nov 04 03:37:49 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 04 03:37:50 2014 +0000 |
| tree | f35e27327287e7b4e5a68b6e357871c8e9c3637a | |
| parent | 89ff8726545e9cced824c655c8e46d1e8f82aa5e [diff] | |
| parent | 0cc963c66334acbcaef7f50c2415080b56c60c78 [diff] |
Merge "Fix build due to bad merge" into lmp-mr1-dev-plus-aosp