commit | 170f92fa668fed4cfdd0dd91393caaa4b88681d7 | [log] [tgz] |
---|---|---|
author | Jason Sams <jsams@google.com> | Tue Nov 26 11:50:07 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 26 11:50:07 2013 -0800 |
tree | 0360f3dfd21fbd88c61622cb964dd8ef9caab21b | |
parent | 1d9ab70b9e03caa2773cd3029f51c3ce11db523e [diff] | |
parent | 9f4a3a9d942905ea3bef73477032a7ac40b8fffc [diff] |
am 9f4a3a9d: am 2d323477: Merge "Sync changes between IP and IP_JB." * commit '9f4a3a9d942905ea3bef73477032a7ac40b8fffc': Sync changes between IP and IP_JB.