OSDN Git Service

am 0d3eb5f1: am 721b370c: Merge "cherrypick from Change-Id: I70cb9111ff5f5a156cecb433...
authorScott Main <smain@google.com>
Mon, 19 Nov 2012 19:50:58 +0000 (11:50 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Nov 2012 19:50:58 +0000 (11:50 -0800)
commit68395a61489c560e68a9f8321df96ccdf776d1b6
tree84b07603abd504400e256011f553b842f1ebd7e6
parent0e1c092ab0ee0f2f499dba2bc51223e106f51964
parent0d3eb5f111571f40c1c25dab229a6b8a98e61eeb
am 0d3eb5f1: am 721b370c: Merge "cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo" into jb-mr1-dev

* commit '0d3eb5f111571f40c1c25dab229a6b8a98e61eeb':
  cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo