OSDN Git Service

am 261e00cb: am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict...
authorScott Main <smain@google.com>
Tue, 13 Aug 2013 18:00:49 +0000 (11:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 Aug 2013 18:00:49 +0000 (11:00 -0700)
commit9b979448581311f27456c1dcb9623a8d21bcf64f
tree6ef40b937c9b73b60571f9b5d67f8b0c545f6c9f
parent6441b9bd19c9226ad1e6c01008b79a51baf75cff
parent261e00cb046db01b2bae9342f34ff99e99ada368
am 261e00cb: am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later.

* commit '261e00cb046db01b2bae9342f34ff99e99ada368':
  Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.