OSDN Git Service

am 268d7ad3: am 310b1e51: am af5b2d3f: am 6e1ce75f: am b430d93b: am cb3ea3d4: Merge...
authorAdam Koch <akoch@google.com>
Thu, 30 Jan 2014 02:02:45 +0000 (18:02 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Jan 2014 02:02:45 +0000 (18:02 -0800)
* commit '268d7ad32995b3c4a9dfe4981878946db6d29ef4':
  Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659


Trivial merge