summaryrefslogtreecommitdiffstats
path: root/voip
diff options
context:
space:
mode:
authorGuang Zhu <guangzhu@google.com>2012-08-20 21:14:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-20 21:14:52 -0700
commitc693b86ff4724cefb43117ab46569011dd428f3a (patch)
tree683428c8adbbb799cfc88ea5e0871cbdd99d32d6 /voip
parent2f2a9fc50acb0e2be6450d1a5031e2019f6893fb (diff)
parent7b3ca5bb418a6300a9caf6e5e5ee31d73f7121b4 (diff)
downloadframeworks_base-c693b86ff4724cefb43117ab46569011dd428f3a.zip
frameworks_base-c693b86ff4724cefb43117ab46569011dd428f3a.tar.gz
frameworks_base-c693b86ff4724cefb43117ab46569011dd428f3a.tar.bz2
am 7b3ca5bb: Merge "Revert "fix sdcard path for webkit perf and layout test scripts"" into jb-mr1-dev
* commit '7b3ca5bb418a6300a9caf6e5e5ee31d73f7121b4': Revert "fix sdcard path for webkit perf and layout test scripts"
Diffstat (limited to 'voip')
0 files changed, 0 insertions, 0 deletions