tree 335b365d6341c39d75c03a07a9f293023bd46042
parent 97bc6d5191c6fbfd9d04b7b6705dcdb9d54eb732
parent 78ba6223a14eac73a1fbfc35bd456348171bffc6
author John Stultz <john.stultz@linaro.org> 1316581275 -0700
committer John Stultz <john.stultz@linaro.org> 1316581275 -0700

Merge branch 'upstream/linaro-3.0' into linaro-android-3.0