OSDN Git Service

am b22aeb23: resolved conflicts for c196f214 to stage-aosp-master
authorPavlin Radoslavov <pavlin@google.com>
Mon, 19 Oct 2015 20:34:58 +0000 (20:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2015 20:34:58 +0000 (20:34 +0000)
commite71c667e24e77144781835fcbaedddfc841e88c3
tree63a65308a744db4b1bc9be13492cb290dd95e190
parentcbdb081fde3fe1231aa317c082e32248ff9f39cf
parentb22aeb23fa102920199f2a537e6628bc8c3781eb
am b22aeb23: resolved conflicts for c196f214 to stage-aosp-master

* commit 'b22aeb23fa102920199f2a537e6628bc8c3781eb':
  GKI cleanup - Moved GKI_get_os_tick_count() to OSI