Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
authorJohn Stultz <john.stultz@linaro.org>
Mon, 14 Apr 2014 19:00:59 +0000 (12:00 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Mon, 14 Apr 2014 19:00:59 +0000 (12:00 -0700)
commitc98e2fbb7e3d997a677cc117f70dfae6f19a802f
tree507e32eeadf62a1ca696d9022c5750d7fe08e295
parent6b0e45a704fce2a1ae1001ec30aa58e64eb3ae28
parentd4f9b043ae029cf3462775d488232c8de4808f22
Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10