OSDN Git Service

resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp
authorSanket Padawe <sanketpadawe@google.com>
Fri, 10 Oct 2014 03:19:59 +0000 (20:19 -0700)
committerSanket Padawe <sanketpadawe@google.com>
Fri, 10 Oct 2014 03:19:59 +0000 (20:19 -0700)
commitce1bfbb04e75a9b4362b2f3070ff4ee5406f136d
tree430d57b0dd33479477afc64ef430625acf733c3b
parent711785f59cfe9aeb71e686bd7f45781bd545472c
parent61719a801c5f9ef3cc42afb3912c9b2c889d99ef
resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp

Change-Id: I3246a5d50f0fa2e324b7c6119a365f8ee9ed2e80