1. 504fd0a resolve merge conflicts of 083f4ec to nyc-dev-plus-aosp by Arve Hjønnevåg · 8 years ago
  2. 2a001e8 resolve merge conflicts of 0783d5f to stage-aosp-master by Dan Willemsen · 8 years ago
  3. 59e086f Start converting Android.mk to Android.bp by Dan Willemsen · 8 years ago