commit | ec33e341f61aafdb1974f4bdd5855740db9fb0e0 | [log] [tgz] |
---|---|---|
author | Katie McCormick <kmccormick@google.com> | Wed Aug 01 16:35:25 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 01 16:35:25 2012 -0700 |
tree | 552aa1c1ef4f0f0da15238992466ce2895396aa2 | |
parent | 2184bae4e58ff5e3c13fbe7493b5dc3d292aaa39 [diff] | |
parent | 1cfe4b40d3cbf11695ffc70efa891559cff040b7 [diff] |
am 1cfe4b40: am 9c311279: Merge "Doc change: 4K -> 4kb" into jb-dev * commit '1cfe4b40d3cbf11695ffc70efa891559cff040b7': Doc change: 4K -> 4kb