OSDN Git Service

am 17bbdcc5: (-s ours) am 839321a3: am c25dbb50: am 7b09a4e5: am e910a7ce: Merge...
authorAlan Viverette <alanv@google.com>
Fri, 14 Mar 2014 00:22:59 +0000 (00:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 00:22:59 +0000 (00:22 +0000)
commitd2df12c219b051acf4cc8fb3c6d78f7d1d4a814b
tree4bf123f5deaf0a702347ef63b0f398bcaa4c521b
parent38a3ddf44a42c07a0ec629537225c9ddd1fd47af
parent17bbdcc549a0469fa3d8ed5778e77964ab7caf2d
am 17bbdcc5: (-s ours) am 839321a3: am c25dbb50: am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev

* commit '17bbdcc549a0469fa3d8ed5778e77964ab7caf2d':
  DO NOT MERGE Check item type before re-binding transient state views