tree ce50eb6bba60bceaefaef8e9954948100d83362b
parent 6ae6459e5b26301416a140bd548d5d7f0a2e80d4
parent c7f66c9795a2df62c0b69bda86d89358aca270dc
author Shih-wei Liao <sliao@google.com> 1294913177 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1294913177 -0800

Merge "Disable on-device linking" into honeycomb