summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAndres Morales <anmorales@google.com>2014-11-10 17:35:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-10 17:35:55 +0000
commit3a8684117db531f3d56743ffa5a9c8ab7ccd0afd (patch)
tree44abe242d7c8ae395f4764bd6c1832d39108c4a4 /docs
parent20083734d92eb893c36278d2486404eedc0cc1f9 (diff)
parent2885c6ba63850d5fd061460683de768617ed6b31 (diff)
downloadframeworks_base-3a8684117db531f3d56743ffa5a9c8ab7ccd0afd.zip
frameworks_base-3a8684117db531f3d56743ffa5a9c8ab7ccd0afd.tar.gz
frameworks_base-3a8684117db531f3d56743ffa5a9c8ab7ccd0afd.tar.bz2
am 2885c6ba: Merge "Fix build" into lmp-mr1-dev
* commit '2885c6ba63850d5fd061460683de768617ed6b31': Fix build
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions