tree 86e2c7e46482f229be9ae886178b4902eb1bcdc4
parent d39a4904fb554a37a511559f84dfe3272c5b1650
parent 4e779b4c67380f09ecebc5ec9cd0f4beb9d786e7
author Elliott Hughes <enh@google.com> 1399504461 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1399504462 +0000

Merge "Android.mk changes for strace update."