commit | 2d40f625c457d93cd7fabb0ca8ea360519f40da9 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Thu Jan 17 17:02:37 2013 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jan 17 17:02:50 2013 +0000 |
tree | b3923f2399b25f84f994a014617317835c407795 | |
parent | 73d94a30a25aec25e27aa1d0a328f033465461c0 [diff] | |
parent | e9818ee8dfe0569b17dc81ca62021621d356677b [diff] |
Merge "DO NOT MERGE Fix build." into jb-mr1-dev-plus-aosp