From: The Android Automerger <android-build@google.com>
Date: Mon, 18 Nov 2013 15:50:37 +0000 (-0800)
Subject: merge in master-release history after reset to master
X-Git-Tag: android-x86-6.0-r1~1273^2~9^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f15987fe9c6560935a149f7c1e43526525212379;p=android-x86%2Fbionic.git

merge in master-release history after reset to master
---

f15987fe9c6560935a149f7c1e43526525212379