commit | 995c3f7577ec634032d4602f33b555476e57e9b8 | [log] [tgz] |
---|---|---|
author | Qiwen Zhao <zhao@google.com> | Wed Mar 11 23:02:07 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 11 23:02:07 2015 +0000 |
tree | 00d3347cb6242c322d7260e992a90c38b87aef99 | |
parent | 5bc9e36f3b2321de87d3c14aa5b65c19284b6bc5 [diff] | |
parent | 7d0f2f41453900df49570c8fbc03710c54ed43c6 [diff] |
am 7d0f2f41: (-s ours) Merge commit \'30594f22\' into stage-aosp-master * commit '7d0f2f41453900df49570c8fbc03710c54ed43c6': Now doing development for API level 23.