tree b2190b665a65bdb7154e6ddf54b707742e96a194
parent aba4384c2b216445e8fde0ea4702cee1755f190b
parent f89fa747e6fe26d7a4b16a9a9c0d0be833503c3d
author Steve Kondik <shade@chemlab.org> 1348514727 -0700
committer Steve Kondik <shade@chemlab.org> 1348514727 -0700

Merge branch 'jb-release' of https://android.googlesource.com/platform/development into aosp