tree 7b177a7741cd82875136d3bb2a1b27f4943d2f3c
parent 695be87d6e87fada03b548d05f82e004d0cdb240
parent f1d2c5aeb23739bde3708f4e4d4bdb99f059f1ed
author Dirk Dougherty <ddougherty@google.com> 1371227390 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371227390 -0700

am f1d2c5ae: Merge "Doc change: diffs for API 18" into jb-mr2-dev

* commit 'f1d2c5aeb23739bde3708f4e4d4bdb99f059f1ed':
  Doc change: diffs for API 18