tree ccb911ba929a5cd8873324642cb1752e0f1cd964
parent 31a1dd2a8f56b439861ee335b55f44323318830c
parent 85b89bf7a30520814fa1ed3c3eed7bbe77ef4029
author Selim Gurun <sgurun@android.com> 1398386349 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1398386350 +0000

Merge "Add a stub to fix master-gpl"