tree 53c781e7f2ae603d81511151c7a071b590c9f71d
parent cfd0c7e0aaa29ffb314b948f7da269f8a2b85a70
parent 8fb9c3ae1116ed608261a41e7602f06502a8546b
author Xavier Ducrohet <xav@google.com> 1386124756 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1386124756 +0000

Merge "rename temporary Android.mk file to not break the build."