tree fdfdb97ba0485b8e4fde319ad31dee7ff6fd3a95
parent 668a6fa227965f744dcee046855cfdde0f14969d
parent aacbdf59d616fd736e0a5041907572a69c175419
author Brad Ebinger <breadley@google.com> 1477685835 +0000
committer android-build-merger <android-build-merger@google.com> 1477685835 +0000

Merge "Modify AIDLs to include Session.Info" into stage-aosp-master
am: aacbdf59d6

Change-Id: I272539ea7124fa18e42ee6f06c89d3ffca449934